Inclide grant_ref_t definition in split-driver struct

defns.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h
index ef95576f1663aeab0d8145d62bdd31937855dc96..1fa28473e4cecc308b633c3498cbbb5a9e12b3eb 100644 (file)
--- a/xen/include/public/io/blkif.h
+++ b/xen/include/public/io/blkif.h
@@ -10,8 +10,7 @@
 #define __XEN_PUBLIC_IO_BLKIF_H__
 
 #include "ring.h"
-
-#include <asm-xen/gnttab.h>    /* for grant_ref_t */
+#include "../gnttab.h" /* for grant_ref_t */
 
 /*
  * Front->back notifications: When enqueuing a new request, sending a

diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h
index 8bae672061cd2e135527c8377b93cbcd667eaa2d..f19220266d3bd3a644f67d870133806f02997401 100644 (file)
--- a/xen/include/public/io/netif.h
+++ b/xen/include/public/io/netif.h
@@ -10,6 +10,7 @@
 #define __XEN_PUBLIC_IO_NETIF_H__
 
 #include "ring.h"
+#include "../gnttab.h" /* for grant_ref_t */
 
 /*
  * Note that there is *never* any need to notify the backend when enqueuing

diff --git a/xen/include/public/io/tpmif.h b/xen/include/public/io/tpmif.h
index f84626be9e41485cda004310532afef051db7664..f1394d07d34b995a9be932bdf04f4df5bae562cf 100644 (file)
--- a/xen/include/public/io/tpmif.h
+++ b/xen/include/public/io/tpmif.h
@@ -16,6 +16,8 @@
 #ifndef __XEN_PUBLIC_IO_TPMIF_H__
 #define __XEN_PUBLIC_IO_TPMIF_H__
 
+#include "../gnttab.h" /* for grant_ref_t */
+
 typedef struct {
     unsigned long addr;   /* Machine address of packet.   */
     grant_ref_t ref;      /* grant table access reference */